Auto merge of #3843 - alexcrichton:fix-override-default-features, r=matklad

Auto merge of #3843 - alexcrichton:fix-override-default-features, r=matklad

Fix overriding mixing with default features

Previously Cargo had a bug where if a crate *without* a default feature was
overridden with one that did indeed have a default feature then the default may
not end up getting activated by accident. The fix was to avoid returning too
quickly hen activating dependencies until after we've inspected and learned
about replacements.

Closes #3812